fix this handling for fn props
unitests for app