.
Added missing tests.
.
Merge branch 'develop'