Removed some of the test files in the ui-router branch; started editing the controller unit test.