add reload and rest buttons
Tidies up context
Add more Boiler tests