Initial improvement of the test suit