Tidy up embed tests