Unit Test Compilation Fixes