fix composer, fix tests