added and corrected tests