fix some more tests
fix id second assing