Make tests work with make3+
Baby steps towards 2.0