Fix various tests

Who does this?! Requiring FQCNs isn't unreasonable.