deck values fixed and tests more readable