Fixed existing unit tests