Removed unnecessary linkages.
Fixed false negative tests.