Update tests to reflect new way of calculating