Test fixes: refer to updated symbol names