Simplifications - Remvoe test fx, separate host.