add a lot of fixes for tests