Merge branch 'issue-37' into 'milestone-3'

renamed repository test classes and other minor tweaks

See merge request !51