whitespace, cleanup
test fixes