ACCESS-94: EndToEnd Test Cleanup