Clean up the configuration; expand the tests