System test now works (3 failures)