Simplify test executables