Uncommented OneBillionTest
refactor