[CHORE] Fixes to pass 5 of 6 tests using real data