break out geometry api from cleanup tests