#4137 Fixing System tests