Unittest now seems to work. Hopefully.