Minor fixes
Integration test cases