Fix broken tests

Because they were broken
Merge branch 'master' of github.com:Nedomas/pavonine