Remove composer
Update tests