Merge TestLuke with main scene's cleanup changes.