Extend the test and restructure