Update unix6 demo
Make BOOTRK05 a map
Fix tests