updating tests for e2e and unit server