Increased the time to wait since test cases failing sometimes on
BuildHive
Added interface 'Identifiable' to build one comparator for ID comparison

(belongs to issue #33)