Fixed XMLs and changed requires. Have PHPUnit running locally now so I can test beforehand