* Clean up superfluous integration setup - part 4 * Adjust tests
Co-authored-by: J. Nick Koston <nick@koston.org>