Further testing changes