Setting id's null to be forgiving in REST API
Removed unresolvable import
Use mock in tests