Fixed manipulation tests