Modified ActionHandlerMap to return Optional

added appropriate tests