Added test suite
Updated test suite for refactor with callback