Added test and review suggestion