Merged test config in with org config, seems simpler that way. Might split it out later.