Dev

Fixed composer.json to make the tests works, and added more tests