add new buffermode=False unit test, reorg a bit