Tests and coverage
Merge branch 'develop'