minor changes to optimize the test