fixed Unit Tests