fix collection tests
fix submit