Finished unit tests. Need to write integration tests next