All tests passing with new configuration refactors