Updates structure and adds test

* Updates structure and adds test