Pedro's HRB changes - now has 75% test coverage