improved quick test