Adding diagnosis testing