Fixed remaining unit test compilation issues and updated accordingly