Minor edits
      * removed comments
      * modified test syntax