Unit test cleanup
Back to good old Rpn