Rework of previous checkin after tests fail - list composition instead of map