fix ordering problem and testGeneratorTimeStep
merge