Fix minor build issues, resulting in the tests now running