[DONE] Systems tests

Fixed few bugs, in the previous cases that had been automated.


If not yet tested by me, I would mark the PR's here after as [DO NOT MERGE]  :)