Reworked configuration stuff and fixed tests that broke tests