BUILD-441 Adding all this stuff to the test script for now