Should fix failing tests. bjmcmorran