Feature #60, tests refactored
Merge branch 'feature-60' into develop