Shoring up servlet, added test case framework