Fixed issue with intrumenting tests