more work ontesting infrastructure