added a spec to make code coverage work
Merged upstream changes