Merge branch 'ab/getcwd-test'