Added tests; more robust heiristics for backward conforming