Change callback functionality so that unit tests will start