Finished coding unit tests