Add test for wrapped conditions
Swap statement, function and condition instrumentation into separate steps