EAGLESIX-2653: Fix constant names
EAGLESIX-2653: Add tests back in