More work on AssetManager and AssetManagerTest