Minor fixes, changed constructors and schema. Temp servlet for tests