Allow directories in expected files for tests.
Replace broken parameterized test with new test structure.