More testing updates