Add reflection extensions
Fix Tests