added a timer and random controller to test plan + some cleaning