Begin refactor of libm-test.inc