History and bill tests/refactoring