Tidy some tests / PHPUnit_Framework_TestCase