Adding the ability to chain Mapper::on() and Mapper::off().  Also added some more tests.