change instrumentation to type and test