Unify inject interface
Rename test files