Fixed some problems that occurred during the merge of FarmView and JobListTest