Fixed findbugs issues
Fixed findbugs issue related to equals test