some progress on integration tests