Modified tests to work with callback