Added/Modified integration tests - tested ok