Enchanced tests