skip problematic tests
small cleanup