Integration tests added, need to add more cases