fixed tests; extended order by customerName; terms functionality
cleanups