Refactor unit-test to use AfterLoadProvider