caf tests added and modification accordingly