Added and corrected some tests