Updated tests to match our new config