added test and corrected tests