Fix baseline collection tests