More Testing Changes