Updated test to suggestions in code review