Add tests and update composer