Re-added 'missing' tests