Added MovementTest and ConsoleIOProviderTest
Resolve conflict