refining a bit the test code