Fix bogus constructor and fix tests