Added comment/tests