unified constructor call signature
fixed test assertions