Turned a couple variables into #defines. Removed variable initialization from the tests header file.