Add more tests
Tests Refactor: alter order of expect and result values on assertEquals calls
Tests Refactor: Change expected exception annotations to explicit method call
Convert tabs to spaces