Little improvments
Update composer
Add some tests

mostly functional ones