Updates for Integration Testing