Minor changes

Fixed debug output and constant naming

Changed test to pull historical expired data