Refactor integration tests for users