Various Testing Changes