Reformat a few tests and add counter to expense list.