Fixed tests to work with changed constructors