streamlined test cases to deal with singleton/ static classes