Catach AFP sharing tests with recent changes