Update to RAP 2.3, fix unit tests