Further corrections for Tests for boundaries
Corrections on ChangeParticle
Write Main