Added test for #3
Resolves #3
Merge branch 'feature/resolve-3' into develop