Make tests work on dev machine again