Fix instrument classes, we were instrumenting test classes :)