CB-7056 serve: return promise of server

+ restore serve tests