Cleaned up a lot of the hardcoded strings used in tests and straightened out test configs a bit more.
Replacing more strings with config values in tests.