updates #9: Tests fix.
Merge branch 'issue-9' into develop