More work on roll tests