Now only introduction of shorthand and addition of tests