Updated composer.json and add tests