pushing up some test fixture changes for Jerebear to peruse