added in first test case and restructured