Fixed up maximum calculations
Attempting to abstract CLI testing