Modified procedures to tests.