Merge "Refactor ApfTest to use more Mockito mocking" into main