Refactor Integrated Tests