Added test + final server