Clean up
Added more geometric function tests