Make manual stopping and starting of the clock in the test mode work again
Moved cloning to AdvancedData