made cy_expect and cy_expect_psi return a python builtin scalar instead an numpy array scalar
code cleanup: clarify relationship between if statements by making them elif where appropriate