fix test
Restore constructors