Fixed Unit Test Issues