Fix unit tests

I wanted to get the tests passing before rooting around too much with the AMDClean configuration. Does this look right to you?