We can't really test that anymore
Fix unit test build
Add some tests