#4: Better handling of host params, improved tests