Ref T16 updated hosts and tests