Change first/last name to nullable
Fix filter for test to pass