Merge branch '36-extensive-tests-for-business-services-and-repositories' into 'master'

Resolve "Extensive tests for business services and repositories"

Closes #36

See merge request !39