Moved utility test into its own class