More Unit Tests pass