Shrinking dependencies and moving enumerate tests
Fix test for new DrDr
Improve serve/servlet docs re JBC