-r in requirements files should now work-ish.

Removing coloured output. Make the string formatting all-around better.
Remove old test files
Updated the test files, increasing test coverage