Fixing Assets tests, other fixes