WIP clean up hacks on top of metal-views
Fix some action helper tests