More tests and Id validation