TEST Test corrections
FUNC Initial dev for Capabily model