Cleanup, add more tests.