Collection of small fixes and the beginnings of integration tests.