Fixed broken test.
Style fixes.