Fix handling of beans depending on the map externally provided beans - and add the missing corresponding test cases