[EDIT] Complex conditional & test

Fixed comments, Added unit Mozilla License in the unit tests