More build break fixes.
Lots more test build break fixes.
Adds missing file.
Fixes the rest of the build breaks!