File path for which we build hierarchy was not consider in cyclic checking.

Added tests for cyclic cases

Change-Id: I0c2e60034c6e8f3aa69ab723350b4c05530fcdfb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>