* add new changes * fix it all * add nicer scenario * some more cleanup * restructure tests * godoc * skip one scenario * space * fix test * clean up * fix conflicts Co-authored-by: Raul Jordan <raul@prysmaticlabs.com>