fixed conditionals tests