Fix style errors and disable an unhelpful test