Fixes requirements files and setup.py, beginning tests