Fix tests to build with current rust