Closes #119

The tests around sixpack-web aren't quite as good..