Test refactoring, introduced constants