Simplify test and benchmark scripts.