Making all the tests pass because I need to start adding new functionality.