tests to new structure