Add tests and modify script primitive.