Fix broken sample tests