Finish grain test - next step refactor