2.1.2. Improved tests and a parameter check fix.