Fix and test 'embed'