fixed tests, grunt file and server js