refactored asset locations, few test fixes