integration test and fix controller test
fix validation