Reinserted commented out tests and corrected one of them.