Minor formatting changes, combined tests