Remove test used in the old system. Fix tests for new system
Merge branch 'angular_refactor' of github.com:cloudspace/angular.crunchinator.com into angular_refactor