Updated currency and tests