Fix Server for thrift 0.6.1

Also fix imports on tests