Flexitest style fixes