Tests fix and composer update