Adding a separate init step, and some updates to tests.