allow testing using old mapper