ensure default index is correct during tests; adjust mapping