added tests; fixed/added detections