Adding hop for unit testing