Merge "Move test requirements into test-requirements.txt"