Tidy some tests

Use PHPUnit_Framework_TestCase instead