Adds coin test range, cleans up code