Moving Convenience tests into their own module.