minor modification for tests
minor modifications