formatting changes, ready for new integration test