Merge branch '108-add-path-resolution-tests' into 'master'

Resolve "Add path resolution tests"

Closes #108

See merge request !48