TestEntity now uses the buffer wrapper