Full test coverage.
v0.6.1

Merge branch 'develop'

* develop:
  Full test coverage.