Rewritten waypoing class with test