Style fixes + tests change.