SSP-1332 addition null tests for FA