Updated requirements and test-requirements