Fix a buncha build failures

Unit test won't work