Add cucumber coverage for partial mocks
Fix spy failures on 1.8