Renamed test case
Reworked serve calculation.