Enhancement: write test to confirm this works (turned off by default)
Fix: clean ups
Enhancement: push tests to confirm this works