Add tests
fix LocateAssets