Fixed Unit Tests