Reorganize tests, add pending email tests