Finished functional and unit tests