final fixes for tests