Address  moved constants into module - allowing usage in tests