[PATCH v2 2/2] activeds/tests: consistent types