Initial revision for test_cap_util tests