Added callback for start
Changed flow of tests