Committing more tests, changing around code to be more testable