refactored test some more, so it can handle uses test files