Fix gentests dependences, broken by extracting out scalactic macros.