removed tearDown override + added cluster checks