[DONE] Systems tests

Fixed few bugs, in the previous cases that had been automated.
1) If not yet tested by me, I would generally mark the PR's as [PENDING]
2) Looks like my earlier PR had got merged.
3) I find it more easy to share code to get comments/suggestions and hence I raise  a PR.
4) Please do not merge PR's if marked PENDING, it could be buggy. :)