Fixing some failed and ignored tests

And also some horrible, horrible Swedish left behind in the code. :(