Updated testing code for new test file. Removed testing cruft.