Added tests
Fixed path issues