fixing unit test (refs: #318)
Merge remote-tracking branch 'origin/dev' into dev