Spam removal and test additions.