Removed todo (re-ordering) and improved test cases