Added some STSM testing structures.