Minor test changes
Fixed geometry
Fixed some integrals
Small fixes