adds testing improvements