Fixed tests to use new constructor