WIP
Refine test_serving