better class name; also put in unit/server test combo
new unit/server testing
new unit/server testing