fixes after xctest transition