minor changes
bump
Added bunches of tests
Added lots more tests
working on #invoices for merchant, done with tests