cleanups; progress on #2

make sure the tests are actually working as they should