Lots of tests

This adds a lot of tests scenarios, removes reference to the amortization parameter (until it is working properly), and improves number rounding.