Fix failing tests
Use path.join()
Merge pull request #58 from codeaholics/master

Fix failing tests