get tests passing post conductor upgrade