Moved test code out of main src tree. Fixes EUCA-7775
Merge branch 'dev/zhill/EUCA-7775' into testing