Update TestStepSpec, FileHandlerSpec, test-data

* test-data: Reorganized and modified test-data.
* TestStepSpec, FileHandlerSpec: Adjusted to test-data changes.