Conditionals tests, fixes