Switch tests coverage added