fixed test cases (again)
more info on instrumentation