Add foreach test
WIP map[s]
Update build