Add tests, ditch Object.create