Updating tests for better baselines