modified tests to include filtering by both users and admins within the same check box.