Test more instructions, fix roll error