Restore edge case test, rename variable.
Restore edge case test, rename variable.

at7/ensembl,muffato/ensembl,james-monkeyshines/ensembl,Ensembl/ensembl,muffato/ensembl,mjg17/ensembl,Ensembl/ensembl,james-monkeyshines/ensembl,at7/ensembl,danstaines/ensembl,danstaines/ensembl,Ensembl/ensembl,muffato/ensembl,mjg17/ensembl,mjg17/ensembl,muffato/ensembl,at7/ensembl,Ensembl/ensembl,james-monkeyshines/ensembl,danstaines/ensembl,mjg17/ensembl,at7/ensembl,james-monkeyshines/ensembl