@markstory you're right. Thank you for your comment, I'll submit a fix.

@ADmad Well, this needs to be fixed too but I don't have many experience writing tests, any help would be very much appreciated. I'm not sure if I can be useful for that.