Added more test-scenes
Merge branch 'test-scenes'