Updated based on unit test