[#6308] Move tickets in a consistent order

Signed-off-by: Cory Johns <cjohns@slashdotmedia.com>
[#6308] Fixed sporadically failing test due to non-mocked SMTP

Signed-off-by: Cory Johns <cjohns@slashdotmedia.com>