Simplify some tests; style guide