Timeout for Service tests was not propagated properly

The patch fixes it.

Change-Id: I3ae68ab2f155bfd0288f3f267db62851fd1b186f