We have testsss! (And some embarassing bugfixes, too!)

Signed-off-by: Luca Fulchir <luker@fenrirproject.org>