Clean up some tests and syntax.