Added and corrected test cases