Avoid `expr` for faster preprocessing
Support single-line test definitions
Merge remote branch 'upstream/master'

Conflicts:
	test/bats.bats