Fixed tests

Fixed test case to work with path resolution
Fixed arguments resolution