Two more config tests and refactor config tests