added more server tests and logic