fix composer & unit tests