Tidy up a few places in test_engine_serivce.py

Change-Id: I3ce32f5057cd074f55466de3a78d8783ab161943
Merge "Tidy up a few places in test_engine_serivce.py"