Added test helpers

Re-factored config settings