Add tests and random_zoom