Revert some stuff
Add tests for dynamic and static getter factory
a bit more help debugging