Update to fix an issue with recent JOSM versions * Also modify some validation checks * Update/fix tests