Fix the build by fixing these unit tests