Added support for typedefs, structs and classes (+test modified accordingly)