Optimalization
Handle test correctly