Modified unit tests to facilitate compilation with non-.NET targets