Fix tests for latest compiler version