Prepayment fees can now be allocated via the waterfall, reinvestment test moved back to its own step even though its functionality is identical to an OC test.

Closes #157
Closes #153