Merge pull request #535 from peternewman/coveralls

Fix the exclusion of the tests for coveralls
Merge pull request #536 from peternewman/coveralls

Improve coverage of a few tests a little bit.
A couple more minor test improvements
Merge branch 'coveralls' of https://github.com/peternewman/ola into coveralls