fixed servlet problem
updates to fix core dependency on servlet and some test fixes
added missed files from previous commit