add/enhance unit tests, adjust comment