Removed id as a required argument for constructor.
Fixed tests.