Move Annotator to its own NS

- Use PHPUnit_Framework_TestCase