More tests and improved RPN support.