Code formatting.
Started rewriting integration tests as unit tests as much as possible