ServerTest
Merged changes and fixed examples
Merged more changes :)