Updated the classes so that the tests pass.