Tests improvements + doc

@jni Improvements of #933