More asset manager tests.
Merge branch 'feature/asset-manager-tests' into develop