Further testing improvements