Clean up, added more tests