Fixed failing unit test, relates to #SB-155
Ensuring that we include all nested type when scanning for types