[Tests] Bring remaining unit tests up to speed with current libraries