Tests fix and composer.json improvements