Added test for single asset and refactored