Update test files to require the right files
Remove redundant string interpolation