Further testing updates added