-- Fix another test
-- Pretty parameters names
-- More tests