improved error message
fix integration tests