Fixes problems with anonymous functions
Refactoring of tests
Add null substitute for property mappings