Update tests to use new structure