Added and corrected tests