Fix test failures from removal of constructors.