Remove commented-out code. Improve fold tests