Extended test
Procedures updated