Added captive data tests