Improve tests with baselines