- some test fixes
- clean up some shenanigans in reflection