Added Unit Testing, Now Using NgRoute and a lot of refactoring