FIX: Bug in CAE, H-CAE costs, unit test added