Generalized some tests that were broken by adding the :spammer user