Replace the one-off make rule for a generic rule for es6-based tests