Add test case for retry to the max, also fix bad constant overrides