Finished up unit tests