Preliminary final changes to roll test