Fix test and build breakage