bug 906359 - add tests for the rename, fallback