Requirements pinning and test fix