Added tracking of 'level_keys' + expanded tests