More @TODO fixes.  Cast ordermethod as an array for testing against.  Cast table row as an array for testing.