Up to date with the master and corrected tests