Compiles with latest libopencash
Minor test adjustments (beautification only)