Unit Tests Fix