Cleanup + more tests.