Added 'core' tests