changes to structure + 1 test