Added complex generic types #1

These are excluded from tests at the moment as the framework cannot
handle them.
More testing of generic types #1