Fixed broken unit tests. They compile again!