ref #4123 - finalize integration/unit tests