System tests

see modification below.