Improved tests and reduced false negatives