Began debugging and adding test cases