Update instructions implementation and tests