Updating PHPUnit annotations in unit tests

I've been omitting and misstating some of the annotations on the
unit tests I've been committing, and this commit should fix those
annotations.

I believe that this brings all the tests I've touched up to date, but if I've made any mistakes I am perfectly happy to try again with another commit.