Cleanup
Wrapped spec method inside an object

Wrapping the spec method inside an object is a workaround issue
SI-7344, this should be removed as soon as the issue is resolved.
Cleenup