Added if_statement, including unit-tests