Testing fixes for SFP