modified testserver