Added more ported DEA tests. Changed structure of vcap_services to more closely mirror the data structure that is producted in the DEA.