Using constants in definitions

So that it's clear in the tests and in the model where they are defined.

Amended the features to use constants also