Global variable psi removed. More tests added.