renamed something
cleaned up most tests to use configuration API