merged test and corrected