Added another test and fixed column ordering