Bugfixes and adding error messages to TestFileParser. Expanding test cases.