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