More style fixes.
Fixed unit tests.