Refactored setUpClass back to instance method of setUp