Finished Unit Testing for Release 2.0