REFAC: Remove fixtures in a few spots, removed extra includes

Some fixtures in classes that probably don't really need them. Also removed a few unneeded includes. Swapped Plane in GeometryTest with MockGeometry.