Fix unit tests on ng branch

mfranklin performed the impressive task of rebasing the remarkably outdated Angular branch with the Master branch. Awesome work there, Matt.

However, while he was able to rebase it and make the project build (a feat on its own) the unit tests are no longer passing.

This ticket is here for us to get those tests working.