integration tests added and edited