minor tweaks for integration testing