Refactor some user integration tests