Now server works. Unit Test for it also included