fixed rtest
v 2.3, cleanups