Fixed Servant class and added starvation test