fixing failing unit tests after accounting changes