some housekeeping stuff and make more tests pass