added more detection tests; fixed some detections