Changing structure + new tests