Add executor test and smooth out test suite.