Added test and comment following review