Download patches

Fixes a bug which was causing tests to fail and implements a TODO