Address pathing issue in #16. Also adding two new test cases (Thanks catigator)