Prevent constant redefinition in tests
Merge pull request #195 from MarkDBlackwell/feature_prevent-constant-redefinition-in-tests

Pull request to prevent constant redefinition in tests