reorganized requirements, hoping to make the test easier and also to reduce dependencies for installations.