switch to using Test::More for expected output. clean up some nitpicks and add some plan tests, some of which fail