Small fixes, improved test scene.