Cleaning up, adding test cases