fixes for tests that fail