Rest WS fixed
Rest refactored
Timer mock