Updating tests. Fixing nested type