AM-80 : Introduce more constants
AM-80 : Use constants in our tests