Test robustness fixes caught by rbx