Cleaned up test code

Moved some default test values to global variables in the test script