Remove usage of trial from most test cases.