Adds preliminary deep=, cleans, and reorganizes
Fixes unholy mess of wrong tests -- Avoid 3am commits next time