Update structure and add in a few more tests