Finished adding unit tests