test .factory json
Merge branch 'master' into tester
update variables for factory usage
remove test code from routes file