Updating composer and fixing unit tests