fixes after running all tests. Make the tests more reliable.