Cleaning up, more tests