wrapper is now more general, renamed test files