test dependencies added
signature of equals() corrected
code cleaned up