Adds testscene
fixes merge conflicts