Add e-server tests