Enhancement: put this into its own test case