[JRO] Refactor tests a bit