Fix/modified system auto/manual tests