Style fixes plus disable intermittently failing test