TestDoctor changes