Code review changes
extended a test