Added some new composition. Tests for mover module.