update tests to be faster, update #2735