Update guide, add test and live listener