Small testing updates