Update requirements and basic test work