More coverage

Basic acceptance/integration specs. 

Includes changes from previous open PRs. If all is acceptable, this can be the only one merged. It would close #10, #9 and #8