Fixed broken sample tests