Speedingup the test