Added constructor initializer formatting.
Fixed some unit tests.