Updated shape syntax
Coverage instrumentation in tests