angularjs files rearangement, test fix