Fix tests to match new constructor