update with callback class and test.

update with callback class and test with same class and methods.