Improve tests, now uses itself as the text executable