Fixing tests. Minor formatting changes.