Removed the need for Settings stubs

This makes the testing code more explicit and easier to understand
Made all tests inherit from BaseTestCase