Separate constants in a new class.
New Probabilities test.
Functions renamed