radio_users - cleaned up and tests updated