Some tweaks to build setup integration test coverage.
Removed unused class.
Updated spec to mark a couple of stories as done.