cleaned up and corrected tests