some minor changes in test functions