clean up tests and some syntax errors