Moved around some things to make PHPUnit less angry.