Changes to the TestScene
Resolving TestScene conflicts.