Adding id checks
Adding code coverage