Removed un-operational test
Merge branch 'develop' into prod