Clean up some test code and config settings