Fix requirements
Fix tests