Merge "Introduce smoke tests for FDS"