Added new test file and corrected small errors