Fix issue with 1.6 compiler
Add test for testing code path where we insert proposed items out of order