Clean up of asset builder.
Added verification of assets in tests.