Updating the utility scripts.
Had the units a bit messed up, but sorted that out and changed over to the
new calculation. Also ran some more tests to make sure things were working
as expected.

Ticket reference: TAO-17