Fix tests and composer dependencies