Catch up unit test for AFP changes