Re-added files for unit tests, added SampleFile and Context changes for error messages.