critical fix, hardcoded testing info was pushed to dev
Merge branch 'dev' into test