Defined specific dir for tests. Added instrumentation for all sub-operations