Improved and renamed the test scenes.