Refactored tests and made new base-classes for new tests which will need to run against an already-set-up server