Fixed integration and sevice tests.