Added struct parsing test and modified struct parsing rules