enhancements for integration tests