whitespace, cleanup
temporarily commenting out failing tests