Adding test after code review