If/Else construct works + unit tests