Added scene test mode

... and fixed a "small" bug in previous commit ;)