refactor some test utils - a couple of tests are broken, but I want to switch from laptop to desktop to fix them...