Took out the custom cfgname stuff, didn't make sense.
Deleted unused test file.