Improve tests
Server rebuild attempt 1