fixing problematic tests.