Add more tests, undo some changes to fixture files

Was causing Email::Reciever tests to fail