Patch for test

This patches improve tests.
These are not necessary soon but would be needed when we bump core to later versions.
Seems you forgot to move the actual constant to the new class :D