working instrumentation tests (but still no unit tests)