Add more tests for borrow. Prune some old code
Remove due_date= which wasn't being used.
More test stuff
resolve conflict