Basic integration tests
Optimize integration tests