Added algerbraic tests on doctor id
Removed/commented out some asserts as they were causing problems in the
testin