Fixed expected return codes for resource creation
Added handlers for CI Types