Added composer.json and updated some tests