New test structure. changed viewer shape api