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