Improved comments & fixed test