Broken down few integration tests to make them more granular