Fixed issue #18 - test function names follow standards.
Merge branch 'issue-18' into develop