f
Change test to reflect new structure
More tests