EJ's fixes for balltrack tests