Improved compliance with watirspec