Change IAsset to be string based
Fix unit tests
Fix code after rebase