fix tests
fix nested form completely