Added unit testing
Finished end 2 end testing