Instead of repeating the check for conditions that must be fulfilled to continue the tests, just use CU_ASSERT_FATAL, which will abort the test and return. Change-Id: If617b286a587d9efb1ce57b90061634ed5bc7ae8 Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>