removing singletons is too expensive. modified test run cases