More admin screen work

including fixing the tests for new setup.
jqgrid also didnt sort, that is sorted too