fix test, new structure