Fix ignore option and add first tests

Change-Id: I1c91853befa935137f2148169be0089365c521a8
Merge "Fix ignore option and add first tests"