move tests over to test.txt and remove unneeded stuff
Merge pull request #471 from andymckay/requirements-cleanup

move tests over to test.txt and remove unneeded stuff