Adjust OF cluster test to Singleton