Restructure ShingoTestLayer