Define constants together as group
Moved Min() into util and added test