Setup so tests can can be run through maven
(cherry-picked from 206351e)