Inclusion and nested fields tests

Change-Id: I38a49293eee8e2061f92704812b4359abb442c2f