Reverted accidently cleared tests