Get server working (again)
Update tests