Improve if tests in system specifics