New tests and Asset Type refactoring