Use simple script for asset embedding
Fix tests