Fix failing tests
Merge branch 'js' of https://github.com/andrewn/raspi-printer into js
Merge branch 'js' of https://github.com/andrewn/raspi-printer into js