Unit Tests update