Correct name for Longs in test
Add forgotten .value() in the refacto