Fixed tests and comments according to comments in pull-req #121
Merge pull request #2 from christoe/pgustafs-1099456

Fixed tests and comments according to comments in pull-req #121