Move constant declaration to top of class
Remove duplication in test setup for collection-related methods