added yet more integration tests