Fixed a test and did a micro refactor
Sort by First, Last or Company name