tests, matrix & multiple emails added