updated conditionals unittest