Change the one-argument Add method; some bug fixes; and refactor random object generation in tests