Fix code review add the test back