Solution: Move ZAP tests to own file test_security_zap.cpp, move common code to testutil_security.hpp
