Rename spamcheck test file, add more tests, update package contents, handle errors on spamcheck