Tests needs cleaning up!

[naik-aakash]

Currently tests run time is increasing a lot without any improvement in code coverage. Some tests may be redundant or could be improved. Need to carefully check if some of the existing tests are actually testing anything worthwhile or are just run through

[JaGeo]

Thanks flagging this.