fixing Unit Tests