refactor parameterized type tests to be more simply
fix directory names and paths