Merge branch 'controller'
Modified the Simulator (time_betwee_main_commands) and modified the two tests