Prepare for the next releases, 2.1.0, which will go as soon as tests are cleaned up