#25 Handle the unit tests. More tests will be required but they should be implemented while working on the other issues