added several changes to the test