More tests
Merge branch 'more_coverage'