remove orig, fix test