Updated global constant names, updated tests