Reinstated system-tests

Change-Id: Ief66d7d28cbff73847af78b4d17b0084177b637e